From 4c33e3bc04f5cef3bf8d25d0207dc40c84bf5c69 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Wed, 8 Feb 2006 15:45:11 +0000 Subject: [PATCH] x86-64 linux: remove dead code Remove left-over pieces from native interrupt handling. From: Jan Beulich Signed-off-by: Christian Limpach --- .../arch/x86_64/kernel/entry-xen.S | 36 ++----------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S b/linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S index 438ab8f164..b1db1916cd 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S @@ -492,42 +492,10 @@ ENTRY(stub_rt_sigreturn) #define XCPT_FRAME _frame ORIG_RAX /* - * Interrupt entry/exit. + * Interrupt exit. * - * Interrupt entry points save only callee clobbered registers in fast path. - * - * Entry runs with interrupts off. */ -/* 0(%rsp): interrupt number */ - .macro interrupt func - cld -#ifdef CONFIG_DEBUG_INFO - SAVE_ALL - movq %rsp,%rdi - /* - * Setup a stack frame pointer. This allows gdb to trace - * back to the original stack. - */ - movq %rsp,%rbp - CFI_DEF_CFA_REGISTER rbp -#else - SAVE_ARGS - leaq -ARGOFFSET(%rsp),%rdi # arg1 for handler -#endif -#if 0 /* For Xen we don't need to do this */ - testl $3,CS(%rdi) - je 1f - swapgs -#endif -1: incl %gs:pda_irqcount # RED-PEN should check preempt count - movq %gs:pda_irqstackptr,%rax - cmoveq %rax,%rsp /*todo This needs CFI annotation! */ - pushq %rdi # save old stack - CFI_ADJUST_CFA_OFFSET 8 - call \func - .endm - retint_check: movl threadinfo_flags(%rcx),%edx andl %edi,%edx @@ -639,7 +607,6 @@ ENTRY(invalidate_interrupt\num) ENTRY(call_function_interrupt) apicinterrupt CALL_FUNCTION_VECTOR,smp_call_function_interrupt #endif -#endif /* !CONFIG_XEN */ #ifdef CONFIG_X86_LOCAL_APIC ENTRY(apic_timer_interrupt) @@ -651,6 +618,7 @@ ENTRY(error_interrupt) ENTRY(spurious_interrupt) apicinterrupt SPURIOUS_APIC_VECTOR,smp_spurious_interrupt #endif +#endif /* !CONFIG_XEN */ /* * Exception entry points. -- 2.30.2